From: Ewan Mellor <ewan@xensource.com>
Date: Tue, 5 Sep 2006 15:23:11 +0000 (+0100)
Subject: Fix inverted sense of getRequiredAvailableMemory and
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15668^2~15
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=710a9ced48a375f9d3578ef3d414709459e4b444;p=xen.git

Fix inverted sense of getRequiredAvailableMemory and
getRequiredInitialReservation on x86 HVM.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
---

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index ca3e38a2ef..50fc073c48 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -448,6 +448,10 @@ class X86_HVM_ImageHandler(HVMImageHandler):
     ostype = "hvm"
 
     def getRequiredAvailableMemory(self, mem_kb):
+        # Add 8 MiB overhead for QEMU's video RAM.
+        return self.getRequiredInitialReservation(mem_kb) + 8192
+
+    def getRequiredInitialReservation(self, mem_kb):
         page_kb = 4
         # This was derived emperically:
         #   2.4 MB overhead per 1024 MB RAM
@@ -456,14 +460,10 @@ class X86_HVM_ImageHandler(HVMImageHandler):
         extra_pages = int( math.ceil( extra_mb*1024 / page_kb ))
         return mem_kb + extra_pages * page_kb
 
-    def getRequiredInitialReservation(self, mem_kb):
-        # Add 8 MiB overhead for QEMU's video RAM.
-        return self.getRequiredAvailableMemory(mem_kb) + 8192
-
     def getRequiredShadowMemory(self, shadow_mem_kb, maxmem_kb):
         # The given value is the configured value -- we need to include the
-        # overhead due to getRequiredMemory.
-        maxmem_kb = self.getRequiredMemory(maxmem_kb)
+        # overhead due to getRequiredInitialReservation.
+        maxmem_kb = self.getRequiredInitialReservation(maxmem_kb)
 
         # 1MB per vcpu plus 4Kib/Mib of RAM.  This is higher than 
         # the minimum that Xen would allocate if no value were given.